Autogenerated HTML docs for v1.5.2-rc0-71-g4342
diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index 8f300e7..2c14306 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html
@@ -272,7 +272,8 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git-fmt-merge-msg</em> <$GIT_DIR/FETCH_HEAD</p> +<p>git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD +git-fmt-merge-msg [--summary | --no-summray] -F <file></p> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -282,6 +283,53 @@ <p>This script is intended mostly for internal use by scripts automatically invoking <tt>git-merge</tt>.</p> </div> +<h2>OPTIONS</h2> +<div class="sectionbody"> +<dl> +<dt> +--summary +</dt> +<dd> +<p> + In addition to branch names, populate the log message with + one-line descriptions from the actual commits that are being + merged. +</p> +</dd> +<dt> +--no-summary +</dt> +<dd> +<p> + Do not list one-line descriptions from the actual commits being + merged. +</p> +</dd> +<dt> +--file <file>, -F <file> +</dt> +<dd> +<p> + Take the list of merged objects from <file> instead of + stdin. +</p> +</dd> +</dl> +</div> +<h2>CONFIGURATION</h2> +<div class="sectionbody"> +<dl> +<dt> +merge.summary +</dt> +<dd> +<p> + Whether to include summaries of merged commits in newly + merge commit messages. False by default. +</p> +</dd> +</dl> +</div> <h2>SEE ALSO</h2> <div class="sectionbody"> <p><a href="git-merge.html">git-merge(1)</a></p> @@ -300,7 +348,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 04-Apr-2007 18:33:42 UTC +Last updated 27-Apr-2007 08:21:41 UTC </div> </div> </body>
